Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 19 May 2010 11:43:55 +0000 (11:43 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 19 May 2010 11:43:55 +0000 (11:43 +0000)
commitacd98002ca417c2a4e1ff4d9896b9dc55cb10342
treed602cfad15a86797a3eb7d9cf11238267a96b45a
parenta754a34b6eac0156eed8c777a42026e25772ce25
parent5d474aa7cdf1c9aacfb433bdf153a79d17a960af
Merge from mainline.